fixed duplicate queries on initial app load