refactored url out, more fixes to form for excluded expressions