Merged filter code from web client and updated the model classses
for message_queueing purposes.