move query methods override to its place

Fix #6