Mini fix: current_user search _relaxed_
Controller's code repetition cleanup