storage initialization at start was implemented
small fixes for query after functional testing