Removing mandatory suffix, fixed chained queries