temporary query solution