Implemented new response query, started on skip logic and more progress on offline mode