Fix for account search