Fixed issue with expanding m/f storing wrong value in url