Rename internal query to queryable, and fix bug in default query.