added a system property to control when query database is loaded