minor code style fix
changed parse method and query
in progress