Improve settings setup + query error