Only extract parameters from query if they're not empty

This way if you have mappings to the same parameter from different query params the parameter value won't be overwritten by the empty one.