Core.js refactor + query stringsd