Merge pull request #111 from aplanas/master

Fix refactorization lost in some merge
Fix a tab
action #1824 - request finder bugs (II)