Bug fixes for querying and saving assets