fix
Merge branch 'hotfix/SQL_query_fix'