Fix for issues with fallback search option.
Fix for issues with passwords.