return empty array if nil
fix not working modification
update message viewer for 2.0
update handler for 2.0