Rework submissions and fix issue where query string would not be removed plus add specs for that