Applying last changes from PS1.5

- Performance improvements
- Fixed categories to get only final branches.
- Extra title with spaces between alphabetical characters and numbers.

Signed-off-by: Carlos Escribano Rey <carlos@markhaus.com>