Make the form query more accurate