Updated za to allow for hanging ampersands in query strings