Added pagination
Added whoosh search