Applied extra checks around user_name before searches