added some responsiveness

https://issues.jboss.org/browse/AGPUSH-973