Fix syntax error
esc_url() and simplification of add/remove_query_arg()