Added query support to the local storage datasource