Adding more search features
Adding search features and export function