Remove +s from decoded URLs, +s should be replaced by spaces
Minor refactor and code cleanup