Added logic for form and url param parsing. Some litle fix