Migrated the Query parse to the common library.