Removed URL param code - it was not a good way to handle things