Query method was fixed. Storage interface changed