Fixed Structured Query with multiple "should" clauses

When clause is added the code attempts to remove the default clause. Remove clause wasn't checking the return from indexOf, thus when -1 was returned it'd remove a clause from the end.