Temporary hotfix for query creation manually

The hotfix prevent from single or double quotes