Fine tuned energiklass search feature

Fine tuning