Fixed are filtering. Also added forrest search