added parser template
improved query 2