Fix id displayed in the options list - refs BT#8566
Add filter by branch - refs BT#8566