undo part of last changeunfortunatly, the 0.9.3 issue can't be fixed so simple as hoped. The "-html" flag is necessary for dealing with autoclosed entries.
Port of downstream commit by Markus Moser: do not use pg query parser to substitute user_id because substitution will take place at a time when :user_id is not available anymore