Add Icons for PIs and added Query Filter