I updated the POI to demonstrate what you can do. I used the original node (point) you made to create you can trace a closed way (polygon) over the outline of the building, and add additional details where possible.

Normally, nodes are used to indicate the approximate location of a POI. If satellite imagery is available, and shows the structure, it is recommended to trace them instead.

Keep it up!

For a building with a BPO, the following tags could be applied:

building=commercial
name=*
addr:city=*
addr:province=*
addr:street=*
addr:barangay=*

For a building with multiple tenants operating as different companies, each node may have
name=*
office=company

does CAP refer to College Assurance Plan?

If so, the node could be appropriately tagged as:
office=insurance

See here:
office=*

Good work!. Thanks for adding new features to OpenStreetMap.

I fixed some of the features you added. For example, when adding fish ponds, you don't need to put "fishpond" as a name. You can use the following tags instead:
landuse=pond
natural=water
water=pond
livestock=fish

With regard to rice fields, you may use the following tags:
crop=rice
landuse=farmland
farm=flooded_crops

And you don't have to put "ricefield" as a name either.

More descriptive comments to changesets would be nice, too.

Feel free to ask or post any questions via:
*Mailing list: [email protected]
*FB page: https://fb.me/OSMPH

Best,