Fixed Searching and Finalized Commenting