Fixed minor bug related to icon positioning. Extended filtering API for more flexibility.