Fix multiple query keywords