Improved query for selecting tag name
just in progress
small changes in the contact forms