Added values from category and values from subpage property parameters

Change-Id: Ie110dc939faf16fe4797ef39b22349a983f57269