move query to static for now