Fixed error with QUERY OBSOLETE
Added some comments and clarifications