split form up and integrated additional rules into the system to perform queries