added query and queryparam custom tags