Broker query string are now based on name not id
Some minor RWD improvements