simplified search; added temporary workaround for empty search