fix persistence and query (to test)