changed queries and entry format