Added filtering, pagination and multiple comments in code