fill missing queries and fix views