Add property file configuration; Some query fixies