Database search issue

@smiller - thank you for the heads up!