Adding fixes for login and search method